Merge
authorGeorge Dunlap <gdunlap@xensource.com>
Tue, 27 Feb 2007 11:02:32 +0000 (06:02 -0500)
committerGeorge Dunlap <gdunlap@xensource.com>
Tue, 27 Feb 2007 11:02:32 +0000 (06:02 -0500)

Trivial merge